From 3b8bd265a3a65141a78f0120bd81708ed0c1300f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 21 May 2020 19:04:27 -0400 Subject: [PATCH] windowhandle: Drop Move and Resize from the fallback menu The expected behavior is that we trigger a keyboard-driven interactive move or resize operation. But that doesn't work with common compositors like mutter or weston, so lets not expose non-working menuitems. --- gtk/gtkwindowhandle.c | 45 ------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c index efe26714d6..0a21694e73 100644 --- a/gtk/gtkwindowhandle.c +++ b/gtk/gtkwindowhandle.c @@ -106,37 +106,6 @@ restore_window_clicked (GtkModelButton *button, gtk_window_unmaximize (window); } -static void -move_window_clicked (GtkModelButton *button, - GtkWindowHandle *self) -{ - GtkNative *native = gtk_widget_get_native (GTK_WIDGET (self)); - GdkSurface *surface = gtk_native_get_surface (native); - - if (GDK_IS_TOPLEVEL (surface)) - gdk_toplevel_begin_move (GDK_TOPLEVEL (surface), - NULL, - 0, /* 0 means "use keyboard" */ - 0, 0, - GDK_CURRENT_TIME); -} - -static void -resize_window_clicked (GtkModelButton *button, - GtkWindowHandle *self) -{ - GtkNative *native = gtk_widget_get_native (GTK_WIDGET (self)); - GdkSurface *surface = gtk_native_get_surface (native); - - if (GDK_IS_TOPLEVEL (surface)) - gdk_toplevel_begin_resize (GDK_TOPLEVEL (surface), - 0, - NULL, - 0, /* 0 means "use keyboard" */ - 0, 0, - GDK_CURRENT_TIME); -} - static void minimize_window_clicked (GtkModelButton *button, GtkWindowHandle *self) @@ -251,20 +220,6 @@ do_popup_fallback (GtkWindowHandle *self, G_CALLBACK (restore_window_clicked), self); gtk_box_append (GTK_BOX (box), menuitem); - menuitem = gtk_model_button_new (); - g_object_set (menuitem, "text", _("Move"), NULL); - gtk_widget_set_sensitive (menuitem, !maximized); - g_signal_connect (G_OBJECT (menuitem), "clicked", - G_CALLBACK (move_window_clicked), self); - gtk_box_append (GTK_BOX (box), menuitem); - - menuitem = gtk_model_button_new (); - g_object_set (menuitem, "text", _("Resize"), NULL); - gtk_widget_set_sensitive (menuitem, resizable && !maximized); - g_signal_connect (G_OBJECT (menuitem), "clicked", - G_CALLBACK (resize_window_clicked), self); - gtk_box_append (GTK_BOX (box), menuitem); - menuitem = gtk_model_button_new (); g_object_set (menuitem, "text", _("Minimize"), NULL); g_signal_connect (G_OBJECT (menuitem), "clicked", -- 2.30.2